From 2c0e16e403110949b7f377ba85d198b0d44e910b Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 29 Jan 2002 11:47:15 +0000 Subject: [PATCH] fixed a segfault that showed up when using the color picker. 2002-01-29 Sven Neumann * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault that showed up when using the color picker. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkimage-x11.c | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b834eae76f..0ca6226039 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b834eae76f..0ca6226039 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b834eae76f..0ca6226039 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b834eae76f..0ca6226039 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b834eae76f..0ca6226039 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b834eae76f..0ca6226039 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b834eae76f..0ca6226039 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-01-29 Sven Neumann + + * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault + that showed up when using the color picker. + Tue Jan 29 11:51:14 2002 Tim Janik * gtk/gtkscale.[hc]: fix default value for ::digits property, diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index 4f03ff8de3..1ce5ca1d8a 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -584,8 +584,6 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable, if (!gdk_rectangle_intersect (&req, &window_rect, &req)) goto out; - private = PRIVATE_DATA (image); - gdk_error_trap_push (); if (!image && @@ -606,6 +604,8 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable, created_image = TRUE; } + private = PRIVATE_DATA (image); + /* In the ShmImage but no ShmPixmap case, we could use XShmGetImage when * we are getting the entire image. */ -- 2.30.2